Helper moved to application package