Form changes and checkbox support added