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