Upgraded simple form wrappers