Adjusted Controllers to relect API changes