Updated API handler classes to support new API structure.