Fixed setter/getter logic
Updated build