Removed dependency on uilibrary