Use tilde notation for dependencies
Change form storage to work on any form