Removed Serializer requirement in a few places and adapted code
accordingly.