Updated interface and controllers