Added specs for lib & gateway