Added method and $fields/$scope formatting