Fixed issue: Some initial improvements