Fixes: #1810 moving the attributes from the core schema to the systems schema