Changed to instance_eval DSL