class property added and code refactor