Removed dependency on trait