Started porting Database and Icon module