Implement BFF functionality, cleanup and fixes