Updated albo and entities