Removed orm dependency