Added drawable entities and imp