Added Core functionality module