Incorporate ::create_resource and ::update_resource methods
Merge branch 'refactoring'