Simplify constructor, add some getters