Check for attributes before assign api id.
Added namespaces for resources.
Merge branch 'development'