Adding getters, setters and data service interfaces