Updated Activity class

New setters and getters