fix existing resource skeleton and database schema for cluster