Removed mapper dependancey