Add support for kicks