Extension: Initial implementation of Controller