added gateway
added entity draft