Refactor of dependent forms