Added members & functions