Added backwardscompatability