Added Applause compatibility. Refactored project