Removed field collection dependency