Add Selection, Filter, View and Layer along with DAO's and tests