Added create and delete logic for automatic account operations
After merge fixes