Feature/super refactor