Refined some methods and added getters/setters.