Fixed decorator so the parameters are optional