Moved metabase-specific objects to own branch