Core 1485 Code improvements