class moved to application