Added gerneal create and update function
Merge branch 'aae' into fifo