WIP: convert local "supports" to new BasicSupport