adding move and create container options to all handlers