Added More options and added CakePHP style formating.
Added helper methods.