Feature/getter setter fields