Implemented interfaces
Updated templates