Added some functionality in the logic_layer for demo