Added absolute imports, added entities and attributes