Added basic support for initial functionality