Improved interpolation parser. Added few specs