Added L337 support