Remove using metaClass because that's going to far
More simplify