Added less support
Added lots of code