Rebuild project to work with API level 6