Removed some abstraction