Continues fixing #9 Implement metastate and property management