Filled Component class and more objectization
Database objectization and some fixes