added atributtes and some getters and setters