Changed to allow new keyword aswell