Removed dependency on compass framework