Fixed some abstraction