Some minor changes
Added solid wrapper