Feature/getset

Getters setters added