Added basic initialization