Removed dependency on sorl