Added Optional type
Tests fixed