Code cleanup. #857
Switch back to magic methods. Changed meta id. #857