Add get & set method
BugFix: Remove copy & paste bug