Modifications to make component play better with Bloomfire app