Added some options to be extended