Added support for custom data on normal shells