Organizing and adding functionalities