addLibrary/Drawable & CrudOperationsEntities fix