Update including tests

Added support for user table.