Form / DataSource refactoring