Add extra constructor, etc.