Added basic validation
Added remove