Add more options to constructor