Add type casting and returns to getters and setters