Opdated coding style and removed un-needed field schema hook