A much more elegant syntax added