Added single check, also removed getList from constructor