Added args, getters and settersx