Added stomp support