Fixed import issues and added serial id