* Added models to handle apps and blocks