Add API methods, method restructuring