Add non-Angular OOP stuff