Composer update and entity getters added